|
|
|
@@ -26,49 +26,49 @@ class OrderInfo(BaseModelMixin):
|
|
26
|
26
|
# DELETED = 9
|
|
27
|
27
|
|
|
28
|
28
|
PAY_STATUS = (
|
|
29
|
|
- (WAITING_PAY, u'待支付'),
|
|
30
|
|
- (PAID, u'已支付'),
|
|
31
|
|
- (FAIL, u'已失败'),
|
|
|
29
|
+ (WAITING_PAY, '待支付'),
|
|
|
30
|
+ (PAID, '已支付'),
|
|
|
31
|
+ (FAIL, '已失败'),
|
|
32
|
32
|
# (DELETED, u'已删除'),
|
|
33
|
33
|
)
|
|
34
|
34
|
|
|
35
|
|
- order_id = ShortUUIDField(_(u'order_id'), max_length=32, help_text=u'订单唯一标识', db_index=True)
|
|
|
35
|
+ order_id = ShortUUIDField(_('order_id'), max_length=32, help_text='订单唯一标识', db_index=True)
|
|
36
|
36
|
|
|
37
|
|
- prepay_id = models.CharField(_(u'prepay_id'), max_length=64, blank=True, null=True, help_text=u'预支付交易会话标识')
|
|
38
|
|
- transaction_id = models.CharField(_(u'transaction_id'), max_length=32, blank=True, null=True, help_text=u'交易单号')
|
|
|
37
|
+ prepay_id = models.CharField(_('prepay_id'), max_length=64, blank=True, null=True, help_text='预支付交易会话标识')
|
|
|
38
|
+ transaction_id = models.CharField(_('transaction_id'), max_length=32, blank=True, null=True, help_text='交易单号')
|
|
39
|
39
|
|
|
40
|
|
- pack_id = models.CharField(_(u'pack_id'), max_length=32, blank=True, null=True, help_text=u'包唯一标识', db_index=True)
|
|
|
40
|
+ pack_id = models.CharField(_('pack_id'), max_length=32, blank=True, null=True, help_text='包唯一标识', db_index=True)
|
|
41
|
41
|
goods_info = JSONField(_('goods_info'), default=[], blank=True, null=True, help_text='商品信息')
|
|
42
|
42
|
|
|
43
|
|
- user_id = models.CharField(_(u'kol_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True)
|
|
44
|
|
- kol_id = models.CharField(_(u'kol_id'), max_length=32, blank=True, null=True, help_text=u'kol_id唯一标识', db_index=True)
|
|
|
43
|
+ user_id = models.CharField(_('user_id'), max_length=32, blank=True, null=True, help_text='用户唯一标识', db_index=True)
|
|
|
44
|
+ kol_id = models.CharField(_('kol_id'), max_length=32, blank=True, null=True, help_text='kol_id唯一标识', db_index=True)
|
|
45
|
45
|
|
|
46
|
|
- body = models.CharField(_(u'body'), max_length=255, blank=True, null=True, help_text=u'商品描述')
|
|
47
|
|
- total_fee = models.IntegerField(_(u'total_fee'), default=0, help_text=u'总金额')
|
|
|
46
|
+ body = models.CharField(_('body'), max_length=255, blank=True, null=True, help_text='商品描述')
|
|
|
47
|
+ total_fee = models.IntegerField(_('total_fee'), default=0, help_text='总金额')
|
|
48
|
48
|
|
|
49
|
|
- name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'姓名')
|
|
50
|
|
- phone = models.CharField(_(u'phone'), max_length=255, blank=True, null=True, help_text=u'电话')
|
|
51
|
|
- address = models.CharField(_(u'address'), max_length=255, blank=True, null=True, help_text=u'地址')
|
|
|
49
|
+ name = models.CharField(_('name'), max_length=255, blank=True, null=True, help_text='姓名')
|
|
|
50
|
+ phone = models.CharField(_('phone'), max_length=255, blank=True, null=True, help_text='电话')
|
|
|
51
|
+ address = models.CharField(_('address'), max_length=255, blank=True, null=True, help_text='地址')
|
|
52
|
52
|
|
|
53
|
|
- tracking_number = models.CharField(_(u'tracking_number'), max_length=255, blank=True, null=True, help_text=u'快递单号')
|
|
54
|
|
- has_send_template_message = models.BooleanField(_(u'has_send_template_message'), default=True, help_text=u'是否已发送模版消息', db_index=True)
|
|
|
53
|
+ tracking_number = models.CharField(_('tracking_number'), max_length=255, blank=True, null=True, help_text='快递单号')
|
|
|
54
|
+ has_send_template_message = models.BooleanField(_('has_send_template_message'), default=True, help_text='是否已发送模版消息', db_index=True)
|
|
55
|
55
|
|
|
56
|
|
- trade_type = models.CharField(_(u'trade_type'), max_length=255, blank=True, null=True, help_text=u'支付方式')
|
|
|
56
|
+ trade_type = models.CharField(_('trade_type'), max_length=255, blank=True, null=True, help_text='支付方式')
|
|
57
|
57
|
|
|
58
|
|
- pay_status = models.IntegerField(_(u'pay_status'), choices=PAY_STATUS, default=WAITING_PAY, help_text=u'支付状态', db_index=True)
|
|
59
|
|
- paid_at = models.DateTimeField(_(u'paid_at'), blank=True, null=True, help_text=_(u'支付时间'))
|
|
|
58
|
+ pay_status = models.IntegerField(_('pay_status'), choices=PAY_STATUS, default=WAITING_PAY, help_text=u'支付状态', db_index=True)
|
|
|
59
|
+ paid_at = models.DateTimeField(_('paid_at'), blank=True, null=True, help_text=_('支付时间'))
|
|
60
|
60
|
|
|
61
|
|
- reback_status = models.BooleanField(_(u'reback_status'), default=False, help_text=u'退款状态', db_index=True)
|
|
62
|
|
- reback_at = models.DateTimeField(_(u'reback_at'), blank=True, null=True, help_text=_(u'退款时间'))
|
|
|
61
|
+ reback_status = models.BooleanField(_('reback_status'), default=False, help_text='退款状态', db_index=True)
|
|
|
62
|
+ reback_at = models.DateTimeField(_('reback_at'), blank=True, null=True, help_text=_('退款时间'))
|
|
63
|
63
|
|
|
64
|
64
|
# 微信统一下单
|
|
65
|
|
- unifiedorder_result = models.TextField(_(u'unifiedorder_result'), blank=True, null=True, help_text=_(u'统一下单结果'))
|
|
|
65
|
+ unifiedorder_result = models.TextField(_('unifiedorder_result'), blank=True, null=True, help_text=_('统一下单结果'))
|
|
66
|
66
|
# 微信支付回调
|
|
67
|
|
- notify_msg = models.TextField(_(u'notify_msg'), blank=True, null=True, help_text=u'回调信息')
|
|
|
67
|
+ notify_msg = models.TextField(_('notify_msg'), blank=True, null=True, help_text='回调信息')
|
|
68
|
68
|
|
|
69
|
69
|
class Meta:
|
|
70
|
|
- verbose_name = _(u'订单信息')
|
|
71
|
|
- verbose_name_plural = _(u'订单信息')
|
|
|
70
|
+ verbose_name = _('订单信息')
|
|
|
71
|
+ verbose_name_plural = _('订单信息')
|
|
72
|
72
|
|
|
73
|
73
|
def __unicode__(self):
|
|
74
|
74
|
return self.pk
|
huangqimin